home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
TeX 1995 July
/
TeX CD-ROM July 1995 (Disc 1)(Walnut Creek)(1995).ISO
/
graphics
/
gnuplot
/
contrib
/
woo
/
amesmod.dif
< prev
next >
Wrap
Text File
|
1992-05-20
|
47KB
|
1,621 lines
diff -rc gnuplot/EPSView.h gnuplot3_26/EPSView.h
*** gnuplot/EPSView.h Wed Mar 25 07:59:08 1992
--- gnuplot3_26/EPSView.h Tue Mar 24 22:45:18 1992
***************
*** 1,9 ****
/*
! * $Id: EPSView.h,v 3.24 1992/02/29 16:29:37 woo Exp woo $
! *
! * $Log: EPSView.h,v $
! * Revision 3.24 1992/02/29 16:29:37 woo
! * gnuplot3.2, beta 4
*
*/
--- 1,5 ----
/*
! * $Id: EPSView.h,v 3.26 92/03/24 22:35:57 woo Exp Locker: woo $
*
*/
diff -rc gnuplot/EPSView.m gnuplot3_26/EPSView.m
*** gnuplot/EPSView.m Wed Mar 25 07:59:08 1992
--- gnuplot3_26/EPSView.m Tue Mar 24 22:45:17 1992
***************
*** 1,16 ****
#ifndef lint
! static char *RCSid = "$Id: EPSView.m,v 3.24 1992/02/29 16:23:41 woo Exp woo $";
#endif
- /*
- * $Log: EPSView.m,v $
- # Revision 3.24 1992/02/29 16:23:41 woo
- # gnuplot3.2, beta 4
- #
- * Revision 3.23 1992/02/21 20:18:16 woo
- * gnuplot3.2, beta 3
- *
- */
#import "EPSView.h"
--- 1,7 ----
#ifndef lint
! static char *RCSid = "$Id: EPSView.m,v 3.26 92/03/24 22:35:56 woo Exp Locker: woo $";
#endif
#import "EPSView.h"
diff -rc gnuplot/EpsViewer.h gnuplot3_26/EpsViewer.h
*** gnuplot/EpsViewer.h Wed Mar 25 07:59:08 1992
--- gnuplot3_26/EpsViewer.h Tue Mar 24 22:45:20 1992
***************
*** 1,9 ****
/*
! * $Id: EpsViewer.h,v 3.24 1992/02/29 16:27:40 woo Exp woo $
! *
! * $Log: EpsViewer.h,v $
! * Revision 3.24 1992/02/29 16:27:40 woo
! * gnuplot3.2, beta 4
*
*/
--- 1,5 ----
/*
! * $Id: EpsViewer.h,v 3.26 92/03/24 22:35:59 woo Exp Locker: woo $
*
*/
diff -rc gnuplot/EpsViewer.m gnuplot3_26/EpsViewer.m
*** gnuplot/EpsViewer.m Wed Mar 25 07:59:09 1992
--- gnuplot3_26/EpsViewer.m Tue Mar 24 22:45:19 1992
***************
*** 1,13 ****
#ifndef lint
! static char *RCSid = "$Id: EpsViewer.m,v 3.24 1992/02/29 16:27:40 woo Exp woo $";
#endif
- /*
- * $Log: EpsViewer.m,v $
- # Revision 3.24 1992/02/29 16:27:40 woo
- # gnuplot3.2, beta 4
- #
- */
#import "EpsViewer.h"
#import "EPSView.h"
--- 1,7 ----
#ifndef lint
! static char *RCSid = "$Id: EpsViewer.m,v 3.26 92/03/24 22:35:58 woo Exp Locker: woo $";
#endif
#import "EpsViewer.h"
#import "EPSView.h"
Only in gnuplot3_26: Makefile
Only in gnuplot3_26: RCS
diff -rc gnuplot/README.3p2 gnuplot3_26/README.3p2
*** gnuplot/README.3p2 Wed Mar 25 07:59:07 1992
--- gnuplot3_26/README.3p2 Tue Mar 24 22:06:46 1992
***************
*** 1,6 ****
! This is the beta5 version of patch2 to gnuplot 3.1, anonymous ftpable from
! ames.arc.nasa.gov:~ftp/pub/gnuplot/gnuplot3p2b5.shar.Z
! ames.arc.nasa.gov:~ftp/pub/gnuplot/gnuplot3p2b5.tar.Z
This is NOT official release.
--- 1,6 ----
! This is the beta6 version of patch2 to gnuplot 3.1, anonymous ftpable from
! ames.arc.nasa.gov:~ftp/pub/gnuplot/gnuplot3p2b6.shar.Z
! ames.arc.nasa.gov:~ftp/pub/gnuplot/gnuplot3p2b6.tar.Z
This is NOT official release.
***************
*** 30,36 ****
Name: Gershon Elber
Email: gershon@gr.utah.edu
! * Subject: New generic gnuplot_x11.c
Name: Ed Kubatis
Email: ejk@ux2.ncsa.uiuc.edu
--- 30,36 ----
Name: Gershon Elber
Email: gershon@gr.utah.edu
! * Subject: New generic gnuplot_x11.c & fixes
Name: Ed Kubatis
Email: ejk@ux2.ncsa.uiuc.edu
Only in gnuplot: beta6.dif
diff -rc gnuplot/command.c gnuplot3_26/command.c
*** gnuplot/command.c Wed Mar 25 07:59:34 1992
--- gnuplot3_26/command.c Thu Apr 9 20:59:21 1992
***************
*** 2,7 ****
--- 2,8 ----
static char *RCSid = "$Id: command.c,v 3.26 92/03/24 22:34:17 woo Exp Locker: woo $";
#endif
+
/* GNUPLOT - command.c */
/*
* Copyright (C) 1986, 1987, 1990, 1991, 1992 Thomas Williams, Colin Kelley
***************
*** 610,616 ****
}
}
!
get_data(this_plot)
struct curve_points *this_plot;
{
--- 611,617 ----
}
}
! #define MAX(X,Y) ((X > Y) ? X : Y)
get_data(this_plot)
struct curve_points *this_plot;
{
***************
*** 618,625 ****
register FILE *fp;
float x, y;
float ylow, yhigh; /* for error bars */
! float temp;
! BOOLEAN yfirst;
char format[MAX_LINE_LEN+1], data_file[MAX_LINE_LEN+1], line[MAX_LINE_LEN+1];
char *float_format = "%f", *float_skip = "%*f";
int xcol = 1, ycol = 2, yemin = 3, yemax = 4;
--- 619,627 ----
register FILE *fp;
float x, y;
float ylow, yhigh; /* for error bars */
! float temp,temp2;
! int yfirst = FALSE; /* changed to reflect permutation */
!
char format[MAX_LINE_LEN+1], data_file[MAX_LINE_LEN+1], line[MAX_LINE_LEN+1];
char *float_format = "%f", *float_skip = "%*f";
int xcol = 1, ycol = 2, yemin = 3, yemax = 4;
***************
*** 644,649 ****
--- 646,652 ----
if ((fp = fopen(data_file, "r")) == (FILE *)NULL)
os_error("can't open data file", c_token);
+
format[0] = '\0';
yfirst = FALSE;
c_token++; /* skip data file name */
***************
*** 675,681 ****
yemin = -1;
yemax = -1;
}
! if (xcol > ycol) yfirst = TRUE;
}
if (!END_OF_COMMAND && isstring(c_token)) {
quotel_str(format, c_token);
--- 678,781 ----
yemin = -1;
yemax = -1;
}
!
!
! if ( yemax < 0 || yemax > (MAX(yemin,MAX(xcol,ycol)))) {
!
!
! if ( yemin < 0 || yemin > MAX(xcol,ycol) ) {
! /* original meaning */
! if (xcol > ycol) yfirst = TRUE; /* s213 */
!
! } else { /* ydelta only, permutation group S3 */
! if (xcol < ycol ) {
! if (yemin > xcol ) {
! yfirst = 2; /* s132 */
! } else {
! yfirst = 3; /* s231 */
! }
! } else {
! if (yemin > ycol ) {
! yfirst = 4; /* s312 */
! } else {
! yfirst = 5; /* s321 */
! }
! }
! }
! } else if ( yemin > MAX(yemax,MAX(xcol,ycol))) {
! /* ylow, yhigh, permutations group S4 */
! /* switch yemin and yemax, order not important */
! i = yemin; /* switch yemin & yemax */
! yemin = yemax;
! yemax = i;
! /* now order S4 as above */
! if ( yemin > MAX(xcol,ycol) ) {
! if (xcol < ycol) {
! yfirst = 6; /* s1243 */
! } else {
! yfirst = 7; /* s2143 */
! }
! } else {
! if (xcol < ycol ) {
! if (yemin > xcol ) {
! yfirst = 8; /* s1342 */
! } else {
! yfirst = 9; /* s2341 */
! }
! } else {
! if (yemin > ycol ) {
! yfirst = 10; /* s3142 */
! } else {
! yfirst = 11; /* s3241 */
! }
! }
! }
! } else if ( ycol > MAX(yemax,MAX(xcol,yemin))) {
! if ( yemax > MAX(xcol,yemin) ) {
! if (xcol < yemin) {
! yfirst = 12; /* s1423 */
! } else {
! yfirst = 13; /* s2413 */
! }
! } else {
! if (xcol < yemin ) {
! if (yemax > xcol ) {
! yfirst = 14; /* s1432 */
! } else {
! yfirst = 15; /* s2431 */
! }
! } else {
! if (yemax > yemin ) {
! yfirst = 16; /* s3412 */
! } else {
! yfirst = 17; /* s3421 */
! }
! }
! }
! } else if ( xcol > MAX(yemax,MAX(ycol,yemin))) {
! if ( yemax > MAX(ycol,yemin) ) {
! if (ycol < yemin) {
! yfirst = 18; /* s4123 */
! } else {
! yfirst = 19; /* s4213 */
! }
! } else {
! if (ycol < yemin ) {
! if (yemax > ycol ) {
! yfirst = 20; /* s4132 */
! } else {
! yfirst = 21; /* s4231 */
! }
! } else {
! if (yemax > yemin ) {
! yfirst = 22; /* s4312 */
! } else {
! yfirst = 23; /* s4321 */
! }
! }
! }
! }
!
}
if (!END_OF_COMMAND && isstring(c_token)) {
quotel_str(format, c_token);
***************
*** 682,722 ****
c_token++; /* skip format */
}
}
if (strlen(format) == 0) {
! for(i = 1; i <= ((xcol > ycol) ? xcol : ycol); i++)
! if ((i == xcol) || (i == ycol))
(void) strcat(format,float_format);
else
(void) strcat(format,float_skip);
-
- if (yemin > 0) {
- /* We have error bars - handle them. */
- yemin -= (xcol > ycol) ? xcol : ycol;
- yemax -= (xcol > ycol) ? xcol : ycol;
- if (yemin > yemax && yemax > 0) {
- i = yemin;
- yemin = yemax;
- yemax = i;
- }
-
- if (yemin == yemax)
- int_error("Two error bar columns are the same",
- NO_CARET);
-
- if (yemin <= 0)
- int_error("Error bar columns must follow data columns",
- NO_CARET);
-
- for (i = 1; i < yemin; i++)
- (void) strcat(format,float_skip);
- (void) strcat(format,float_format);
-
- if (yemax > 0) {
- for (i = 1; i < yemax - yemin; i++)
- (void) strcat(format,float_skip);
- (void) strcat(format,float_format);
- }
- }
}
l_num = 0;
--- 782,795 ----
c_token++; /* skip format */
}
}
+
if (strlen(format) == 0) {
! for(i = 1; i <= MAX(xcol,MAX(ycol,MAX(yemin,yemax))) ; i++)
! /* works because yemin & yemax are -1 */
! if ((i == xcol) || (i == ycol) || (i == yemin) || (i == yemax))
(void) strcat(format,float_format);
else
(void) strcat(format,float_skip);
}
l_num = 0;
***************
*** 761,767 ****
/* no break; !!! */
}
case 2: {
! if (yfirst) { /* exchange x and y */
temp = y;
y = x;
x = temp;
--- 834,840 ----
/* no break; !!! */
}
case 2: {
! if (yfirst == TRUE) { /* exchange x and y */
temp = y;
y = x;
x = temp;
***************
*** 773,782 ****
break;
}
case 3: { /* x, y, ydelta */
! if (yfirst) { /* exchange x and y */
! temp = y;
! y = x;
! x = temp;
}
datum++;
--- 846,887 ----
break;
}
case 3: { /* x, y, ydelta */
! switch (yfirst) { /* S3 permutation group */
! case 0:
! break;
! case 1:{ /* s213 */
! temp = y;
! y = x;
! x = temp;
! break;
! }
! case 2:{ /* s132 */
! temp = y;
! y = ylow;
! ylow = temp;
! break;
! }
! case 3:{ /* s231 */
! temp = x;
! temp2 = y;
! y = ylow;
! x = temp2;
! ylow = temp;
! break;
! }
! case 4:{ /* s312 */
! temp = x;
! x = ylow;
! ylow = y;
! y = temp;
! break;
! }
! case 5:{ /* s321 */
! temp = x;
! x = ylow;
! ylow = temp;
! break;
! }
}
datum++;
***************
*** 785,797 ****
break;
}
case 4: { /* x, y, ylow, yhigh */
! if (yfirst) { /* exchange x and y */
! temp = y;
! y = x;
! x = temp;
}
datum++;
!
store2d_point(this_plot, i++, x, y, ylow, yhigh);
break;
}
--- 890,1081 ----
break;
}
case 4: { /* x, y, ylow, yhigh */
!
!
! switch (yfirst) { /* S4 permutation group */
! case 0:
! break;
! case 1:{ /* s2134 */
! temp = y;
! y = x;
! x = temp;
! break;
! }
! case 2:{ /* s1324 */
! temp = y;
! y = ylow;
! ylow = temp;
! break;
! }
! case 3:{ /* s2314 */
! temp = x;
! x = y;
! temp2 = ylow;
! y = temp2;
! ylow = temp;
! break;
! }
! case 4:{ /* s3124 */
! temp = x;
! x = ylow;
! temp2 = y;
! ylow = temp2;
! y = temp;
! break;
! }
! case 5:{ /* s3214 */
! temp = x;
! x = ylow;
! ylow = temp;
! break;
! }
! case 6: { /* s1243 */
! temp = yhigh;
! yhigh = ylow;
! ylow = temp;
! break;
! }
! case 7:{ /* s2143 */
! temp = y;
! y = x;
! x = temp;
! temp = yhigh;
! yhigh = ylow;
! ylow = temp;
! break;
! }
! case 8:{ /* s1342 */
! temp = y;
! y = ylow;
! temp2 = yhigh;
! ylow = temp2;
! yhigh = temp;
! break;
! }
! case 9:{ /* s2341 */
! temp = x;
! x = y;
! temp2 = yhigh;
! y = ylow;
! yhigh = temp; /* use fact order not important */
! ylow = temp2;
! break;
! }
! case 10:{ /* s3142 */
! temp = x;
! x = ylow;
! temp2 = y;
! y = temp;
! ylow = yhigh;
! yhigh = temp2; /* use order independence */
! break;
! }
! case 11:{ /* s3241 */
! temp = x;
! x = yhigh;
! yhigh = temp;
! break;
! }
! case 12: { /* s1423 */
! temp = ylow;
! temp2 = yhigh;
! yhigh = temp;
! ylow = y;
! y = temp2;
! break;
! }
! case 13:{ /* s2413 */
! temp = x;
! x = y;
! temp2 = ylow;
! y = yhigh;
! ylow = temp;
! yhigh = temp2;
! break;
! }
! case 14:{ /* s1432 */
! temp = y;
! y = yhigh;
! yhigh = temp;
! break;
! }
! case 15:{ /* s2431 */
! temp = x;
! x = y;
! y = yhigh;
! yhigh = temp; /* use fact order not important */
! break;
! }
! case 16:{ /* s3412 */
! temp = x;
! x = ylow;
! ylow = temp;
! temp2 =y;
! y = yhigh;
! yhigh = temp2; /* use order independence */
! break;
! }
! case 17:{ /* s3421 */
! temp = x;
! x = ylow;
! temp2 = yhigh;
! yhigh = temp;
! temp = y;
! y = temp2;
! ylow = temp;
! break;
! }
! case 18: { /* s4123 */
! temp = x;
! x = yhigh;
! temp2 = y;
! y = temp;
! yhigh = ylow;
! ylow = temp2;
! break;
! }
! case 19:{ /* s4213 */
! temp = x;
! x = ylow;
! ylow = temp;
! break;
! }
! case 20:{ /* s4132 */
! temp = y;
! y = x;
! temp2 = yhigh;
! yhigh = temp;
! x = temp2;
! break;
! }
! case 21:{ /* s4231 */
! temp = x;
! x = yhigh;
! yhigh = temp;
! break;
! }
! case 22:{ /* s4312 */
! temp = x;
! temp2 = y;
! y = ylow;
! x = yhigh;
! ylow = temp;
! yhigh = temp2;
! break;
! }
! case 23:{ /* s4321 */
! temp = x;
! x = yhigh;
! yhigh = temp;
! temp = y;
! y = ylow;
! ylow = temp;
! break;
! }
}
+
datum++;
!
store2d_point(this_plot, i++, x, y, ylow, yhigh);
break;
}
***************
*** 1343,1348 ****
--- 1627,1633 ----
printf("Plot title: '%s'\n", this_plot->title);
printf("Line type %d\n", this_plot->line_type);
printf("Point type %d\n", this_plot->point_type);
+ printf("ErrorBar type %d\n", this_plot->errorbar_type);
printf("max points %d\n", this_plot->p_max);
printf("current points %d\n", this_plot->p_count);
printf("\n");
***************
*** 1437,1443 ****
register double x, xdiff, temp;
static struct value a;
BOOLEAN ltmp, some_data_files = FALSE;
! int plot_num, line_num, point_num, xparam=0;
char *xtitle;
void parametric_fixup();
--- 1722,1728 ----
register double x, xdiff, temp;
static struct value a;
BOOLEAN ltmp, some_data_files = FALSE;
! int plot_num, line_num, point_num, errorbar_num=0, xparam=0;
char *xtitle;
void parametric_fixup();
***************
*** 1452,1457 ****
--- 1737,1743 ----
plot_num = 0;
line_num = 0; /* default line type */
point_num = 0; /* default point type */
+ errorbar_num = 0; /* default errorbar type */
xtitle = NULL;
***************
*** 1538,1543 ****
--- 1824,1830 ----
this_plot->line_type = line_num;
this_plot->point_type = point_num;
+ this_plot->errorbar_type = errorbar_num;
if (almost_equals(c_token,"w$ith")) {
if (parametric && xparam)
***************
*** 1554,1559 ****
--- 1841,1850 ----
struct value t;
this_plot->point_type = (int)real(const_express(&t))-1;
}
+ if ( !equals(c_token,",") && !END_OF_COMMAND ) {
+ struct value t;
+ this_plot->errorbar_type = (int)real(const_express(&t));
+ }
if ( (this_plot->plot_style == POINTS) ||
(this_plot->plot_style == LINESPOINTS) ||
(this_plot->plot_style == ERRORBARS) )
***************
*** 1726,1731 ****
--- 2017,2026 ----
}
/* line and point types were handled above */
+ if ( !equals(c_token,",") && !END_OF_COMMAND ) {
+ struct value t;
+ (void)real(const_express(&t));
+ }
if ( !equals(c_token,",") && !END_OF_COMMAND ) {
struct value t;
(void)real(const_express(&t));
Common subdirectories: gnuplot/demo and gnuplot3_26/demo
Common subdirectories: gnuplot/docs and gnuplot3_26/docs
diff -rc gnuplot/graph3d.c gnuplot3_26/graph3d.c
*** gnuplot/graph3d.c Wed Mar 25 07:59:40 1992
--- gnuplot3_26/graph3d.c Thu Apr 9 20:59:21 1992
***************
*** 923,928 ****
--- 923,958 ----
y+ytop+(t->v_char), title);
}
+ /* PLACE TOP TITLE */
+ if (*top_title != 0) {
+ int x, y;
+
+ x = top_title_xoffset * t->h_char;
+ y = top_title_yoffset * t->v_char;
+
+ if ((*t->justify_text)(CENTRE))
+ (*t->put_text)(x+(xleft+xright)/2,
+ y+ytop+2*(t->v_char), top_title);
+ else
+ (*t->put_text)(x+(xleft+xright)/2 - strlen(top_title)*(t->h_char)/2,
+ y+ytop+2*(t->v_char), top_title);
+ }
+
+ /* PLACE BOTTOM TITLE */
+ if (*bottom_title != 0) {
+ int x, y;
+
+ x = bottom_title_xoffset * t->h_char;
+ y = bottom_title_yoffset * t->v_char;
+
+ if ((*t->justify_text)(CENTRE))
+ (*t->put_text)(x+(xleft+xright)/2,
+ y+ybot-2*(t->v_char), bottom_title);
+ else
+ (*t->put_text)(x+(xleft+xright)/2 - strlen(bottom_title)*(t->h_char)/2,
+ y+ybot-2*(t->v_char), bottom_title);
+ }
+
/* PLACE TIMEDATE */
if (timedate) {
int x, y;
diff -rc gnuplot/graphics.c gnuplot3_26/graphics.c
*** gnuplot/graphics.c Wed Mar 25 07:59:41 1992
--- gnuplot3_26/graphics.c Thu Apr 9 20:59:22 1992
***************
*** 46,51 ****
--- 46,52 ----
#include "setshow.h"
extern char *strcpy(),*strncpy(),*strcat(),*ctime();
+ extern int print_points();
char *tdate;
#ifdef AMIGA_AC_5
time_t dated;
***************
*** 60,65 ****
--- 61,67 ----
void plot_impulses();
void plot_lines();
void plot_points();
+ void plot_tics();
void plot_dots();
void plot_bars();
void edge_intersect();
***************
*** 66,72 ****
BOOLEAN two_edge_intersect();
/* for plotting error bars */
! #define ERRORBARTIC (t->h_tic/2) /* half the width of error bar tic mark */
#ifndef max /* Lattice C has max() in math.h, but shouldn't! */
#define max(a,b) ((a > b) ? a : b)
--- 68,74 ----
BOOLEAN two_edge_intersect();
/* for plotting error bars */
! #define ERRORBARTIC (t->h_tic/4) /* half the width of error bar tic mark */
#ifndef max /* Lattice C has max() in math.h, but shouldn't! */
#define max(a,b) ((a > b) ? a : b)
***************
*** 458,463 ****
--- 460,497 ----
}
+
+ /* PLACE TOP TITLE */
+ if (*top_title != NULL) {
+ int x, y;
+
+ x = top_title_xoffset * t->h_char;
+ y = top_title_yoffset * t->v_char;
+
+ if ((*t->justify_text)(CENTRE))
+ (*t->put_text)(x+(xleft+xright)/2,
+ y+ytop+2*(t->v_char), top_title);
+ else
+ (*t->put_text)(x+(xleft+xright)/2 - strlen(top_title)*(t->h_char)/2,
+ y+ytop+2*(t->v_char), top_title);
+ }
+
+
+ /* PLACE BOTTOM TITLE */
+ if (*bottom_title != NULL) {
+ int x, y;
+
+ x = bottom_title_xoffset * t->h_char;
+ y = bottom_title_yoffset * t->v_char;
+
+ if ((*t->justify_text)(CENTRE))
+ (*t->put_text)(x+(xleft+xright)/2,
+ y+ybot-3*(t->v_char), bottom_title);
+ else
+ (*t->put_text)(x+(xleft+xright)/2 - strlen(bottom_title)*(t->h_char)/2,
+ y+ybot-3*(t->v_char), bottom_title);
+ }
+
/* PLACE TIMEDATE */
if (timedate) {
int x, y;
***************
*** 606,622 ****
(*t->point)(xl+2*(t->h_char),yl,
this_plot->point_type);
}
- plot_points(this_plot);
/* for functions, just like POINTS */
if (this_plot->plot_type == DATA) {
if (key != 0) {
(*t->move)(xl+(t->h_char),yl);
(*t->vector)(xl+4*(t->h_char),yl);
(*t->move)(xl+(t->h_char),yl+ERRORBARTIC);
(*t->vector)(xl+(t->h_char),yl-ERRORBARTIC);
(*t->move)(xl+4*(t->h_char),yl+ERRORBARTIC);
(*t->vector)(xl+4*(t->h_char),yl-ERRORBARTIC);
}
plot_bars(this_plot);
}
--- 640,665 ----
(*t->point)(xl+2*(t->h_char),yl,
this_plot->point_type);
}
+ if( (this_plot->errorbar_type) == 0) {
+ plot_points(this_plot);
+ } else {
+ plot_tics(this_plot);
+ }
+
/* for functions, just like POINTS */
if (this_plot->plot_type == DATA) {
if (key != 0) {
(*t->move)(xl+(t->h_char),yl);
(*t->vector)(xl+4*(t->h_char),yl);
+ (*t->point)(xl+2*(t->h_char),yl,
+ this_plot->point_type);
+ /*
(*t->move)(xl+(t->h_char),yl+ERRORBARTIC);
(*t->vector)(xl+(t->h_char),yl-ERRORBARTIC);
(*t->move)(xl+4*(t->h_char),yl+ERRORBARTIC);
(*t->vector)(xl+4*(t->h_char),yl-ERRORBARTIC);
+ */
}
plot_bars(this_plot);
}
***************
*** 801,810 ****
/* by here everything has been mapped */
(*t->move)(xM, ylowM);
(*t->vector)(xM, yhighM); /* draw the main bar */
! (*t->move)(xM-tic, ylowM); /* draw the bottom tic */
! (*t->vector)(xM+tic, ylowM);
! (*t->move)(xM-tic, yhighM); /* draw the top tic */
! (*t->vector)(xM+tic, yhighM);
}
}
--- 844,855 ----
/* by here everything has been mapped */
(*t->move)(xM, ylowM);
(*t->vector)(xM, yhighM); /* draw the main bar */
! if( plot->errorbar_type ==0 ) {/* add extra tics for errorbar_types */
! (*t->move)(xM-tic, ylowM); /* draw the bottom tic */
! (*t->vector)(xM+tic, ylowM);
! (*t->move)(xM-tic, yhighM); /* draw the top tic */
! (*t->vector)(xM+tic, yhighM);
! }
}
}
***************
*** 852,857 ****
--- 897,933 ----
}
}
}
+
+ /* plot_tics:
+ * Plot the curves in TICS style
+ */
+ void
+ plot_tics(plot)
+ struct curve_points *plot;
+ {
+ struct termentry *t = &term_tbl[term];
+ int i;
+ int x,y;
+ int tic = ERRORBARTIC;
+
+ for (i = 0; i < plot->p_count; i++) {
+ if (plot->points[i].type == INRANGE) {
+ x = map_x(plot->points[i].x);
+ y = map_y(plot->points[i].y);
+ if( plot->errorbar_type == 1) {
+ (*t->move)(x-tic, y); /* draw the left tic */
+ (*t->vector)(x, y);
+ } else if (plot->errorbar_type == 2) {
+ (*t->move)(x, y); /* draw the right tic */
+ (*t->vector)(x+tic, y);
+ } else if (plot->errorbar_type == 3) {
+ (*t->move)(x-tic, y); /* draw the center tic */
+ (*t->vector)(x+tic, y);
+ }
+ }
+ }
+ }
+
/* single edge intersection algorithm */
/* Given two points, one inside and one outside the plot, return
diff -rc gnuplot/misc.c gnuplot3_26/misc.c
*** gnuplot/misc.c Wed Mar 25 07:59:52 1992
--- gnuplot3_26/misc.c Thu Apr 9 21:00:02 1992
***************
*** 502,507 ****
--- 502,508 ----
log_x ? 'x' : ' ', log_y ? 'y' : ' ');
if (log_z) fprintf(fp,"set logscale z\n");
fprintf(fp,"set offsets %g, %g, %g, %g\n",loff,roff,toff,boff);
+ fprintf(fp,"set %stime\n", (timedate)? "" : "no");
fprintf(fp,"set %spolar\n", (polar)? "" : "no");
fprintf(fp,"set angles %s\n", (angles_format == ANGLES_RADIANS)?
"radians" : "degrees");
***************
*** 552,557 ****
--- 553,560 ----
save_tics(fp, ytics, 'y', &yticdef);
save_tics(fp, ztics, 'z', &zticdef);
fprintf(fp,"set title \"%s\" %d,%d\n",title,title_xoffset,title_yoffset);
+ fprintf(fp,"set top_title \"%s\" %d,%d\n",top_title,top_title_xoffset,top_title_yoffset);
+ fprintf(fp,"set bottom_title \"%s\" %d,%d\n",bottom_title,bottom_title_xoffset,bottom_title_yoffset);
if (timedate)
fprintf(fp,"set time %d,%d\n",time_xoffset,time_yoffset);
else
diff -rc gnuplot/plot.h gnuplot3_26/plot.h
*** gnuplot/plot.h Wed Mar 25 07:59:55 1992
--- gnuplot3_26/plot.h Thu Apr 9 21:17:26 1992
***************
*** 164,171 ****
#else /* vms */
!
#define is_comment(c) ((c) == '#')
#define is_system(c) ((c) == '!')
--- 164,174 ----
#else /* vms */
! #ifdef MSDOS
! #define is_comment(c) ((c) == '\#')
! #else
#define is_comment(c) ((c) == '#')
+ #endif /* MSDOS*/
#define is_system(c) ((c) == '!')
***************
*** 358,363 ****
--- 361,367 ----
char *title;
int line_type;
int point_type;
+ int errorbar_type;
int p_max; /* how many points are allocated */
int p_count; /* count of points in points */
struct coordinate *points;
diff -rc gnuplot/setshow.c gnuplot3_26/setshow.c
*** gnuplot/setshow.c Wed Mar 25 07:59:59 1992
--- gnuplot3_26/setshow.c Thu Apr 9 21:00:03 1992
***************
*** 100,105 ****
--- 100,107 ----
int term = 0; /* unknown term is 0 */
char term_options[MAX_ID_LEN+1] = "";
char title[MAX_LINE_LEN+1] = "";
+ char top_title[MAX_LINE_LEN+1] = "";
+ char bottom_title[MAX_LINE_LEN+1] = "";
char xlabel[MAX_LINE_LEN+1] = "";
char ylabel[MAX_LINE_LEN+1] = "";
char zlabel[MAX_LINE_LEN+1] = "";
***************
*** 107,112 ****
--- 109,118 ----
int time_yoffset = 0;
int title_xoffset = 0;
int title_yoffset = 0;
+ int top_title_xoffset = 0;
+ int top_title_yoffset = 0;
+ int bottom_title_xoffset = 0;
+ int bottom_title_yoffset = 0;
int xlabel_xoffset = 0;
int xlabel_yoffset = 0;
int ylabel_xoffset = 0;
***************
*** 189,194 ****
--- 195,201 ----
static void show_style(), show_range(), show_zero(), show_border();
static void show_offsets(), show_output(), show_samples(), show_isosamples();
static void show_view(), show_size(), show_title(), show_xlabel();
+ static void show_bottom_title(), show_top_title();
static void show_angles();
static void show_ylabel(), show_zlabel(), show_xzeroaxis(), show_yzeroaxis();
static void show_label(), show_arrow(), show_grid(), show_key();
***************
*** 218,223 ****
--- 225,231 ----
'offsets', 'output', '{no}parametric', '{no}polar', 'rrange', \n\
'samples', 'size', '{no}surface', 'terminal', 'tics', 'ticslevel', \n\
'{no}time', 'title', 'trange', 'urange', 'view', 'vrange', 'xlabel', \n\
+ 'top_title','bottom_title', \n\
'xrange', '{no}xtics', '{no}xzeroaxis', 'ylabel', 'yrange', \n\
'{no}ytics', '{no}yzeroaxis', 'zero', '{no}zeroaxis', 'zlabel', \n\
'zrange', '{no}ztics'", c_token);
***************
*** 587,592 ****
--- 595,606 ----
else if (almost_equals(c_token,"tit$le")) {
set_xyzlabel(title,&title_xoffset,&title_yoffset);
}
+ else if (almost_equals(c_token,"top$_title")) {
+ set_xyzlabel(top_title,&top_title_xoffset,&top_title_yoffset);
+ }
+ else if (almost_equals(c_token,"bot$tom_title")) {
+ set_xyzlabel(bottom_title,&bottom_title_xoffset,&bottom_title_yoffset);
+ }
else if (almost_equals(c_token,"xl$abel")) {
set_xyzlabel(xlabel,&xlabel_xoffset,&xlabel_yoffset);
}
***************
*** 1774,1779 ****
--- 1788,1794 ----
'offsets', 'output', 'plot', 'parametric', 'polar', 'rrange', \n\
'samples', 'isosamples', 'view', 'size', 'terminal', 'tics', \n\
'ticslevel', 'time', 'title', 'trange', 'urange', 'vrange', \n\
+ 'top_title','bottom_title', \n\
'variables', 'version', 'xlabel', 'xrange', 'xtics', 'xzeroaxis', \n\
'ylabel', 'yrange', 'ytics', 'yzeroaxis', 'zlabel', 'zrange', \n\
'ztics', 'zero', 'zeroaxis'", c_token);
***************
*** 1877,1882 ****
--- 1892,1907 ----
show_title();
c_token++;
}
+ else if (almost_equals(c_token,"top$_title")) {
+ (void) putc('\n',stderr);
+ show_top_title();
+ c_token++;
+ }
+ else if (almost_equals(c_token,"bot$tom_title")) {
+ (void) putc('\n',stderr);
+ show_bottom_title();
+ c_token++;
+ }
else if (almost_equals(c_token,"xl$abel")) {
(void) putc('\n',stderr);
show_xlabel();
***************
*** 2111,2116 ****
--- 2136,2143 ----
show_range('y',ymin,ymax);
show_range('z',zmin,zmax);
show_title();
+ show_top_title();
+ show_bottom_title();
show_xlabel();
show_ylabel();
show_zlabel();
***************
*** 2217,2222 ****
--- 2244,2263 ----
{
fprintf(stderr,"\ttitle is \"%s\", offset at %d, %d\n",
title,title_xoffset,title_yoffset);
+ }
+
+ static void
+ show_top_title()
+ {
+ fprintf(stderr,"\ttop_title is \"%s\", offset at %d, %d\n",
+ top_title,top_title_xoffset,top_title_yoffset);
+ }
+
+ static void
+ show_bottom_title()
+ {
+ fprintf(stderr,"\tbottom_title is \"%s\", offset at %d, %d\n",
+ bottom_title,bottom_title_xoffset,bottom_title_yoffset);
}
static void
diff -rc gnuplot/setshow.h gnuplot3_26/setshow.h
*** gnuplot/setshow.h Wed Mar 25 07:59:59 1992
--- gnuplot3_26/setshow.h Thu Apr 9 21:00:03 1992
***************
*** 88,102 ****
--- 88,118 ----
extern float surface_scale;
extern float surface_zscale;
extern int term; /* unknown term is 0 */
+ #ifdef __TURBOC__
+ extern char *term_options;
+ extern char *title;
+ extern char *top_title;
+ extern char *bottom_title;
+ extern char *xlabel;
+ extern char *ylabel;
+ extern char *zlabel;
+ #else
extern char term_options[];
extern char title[];
+ extern char top_title[];
+ extern char bottom_title[];
extern char xlabel[];
extern char ylabel[];
extern char zlabel[];
+ #endif
extern int time_xoffset;
extern int time_yoffset;
extern int title_xoffset;
extern int title_yoffset;
+ extern int top_title_xoffset;
+ extern int top_title_yoffset;
+ extern int bottom_title_xoffset;
+ extern int bottom_title_yoffset;
extern int xlabel_xoffset;
extern int xlabel_yoffset;
extern int ylabel_xoffset;
Common subdirectories: gnuplot/term and gnuplot3_26/term
Only in gnuplot3_26/demo: RCS
diff -rc gnuplot/demo/errorbar.demo gnuplot3_26/demo/errorbar.demo
*** gnuplot/demo/errorbar.demo Wed Mar 25 08:00:13 1992
--- gnuplot3_26/demo/errorbar.demo Thu Apr 9 21:00:03 1992
***************
*** 26,33 ****
--- 26,77 ----
set title "Plot data file twice to get lines and errorbars"
plot [-3:65] [6:14] "err.dat" with lines, "err.dat" using 1:2:4:3 with errorbars
+ pause -1 "Hit return to continue"
+ set title "T-BOND FUTURES"
+ set grid
+ set yrange [8500:9200]
+ set xrange [1:530]
+ set nologscale y
+ set xlabel "High Low Closing Prices"
+ set ylabel "Price in Dollars"
+ plot "futures.dat" using 1:6:4:5 with errorbar 1 1 2
+
+ pause -1 "Hit Return to Continue"
+
+ set xlabel "High Low Opening Prices"
+ plot "futures.dat" using 1:3:4:5 with errorbar 1 1 1
+
+ pause -1 "Hit Return to Continue"
+
+ set xlabel "High Low Opening Closing Prices"
+ plot "futures.dat" using 1:6:4:5 title "Open" with errorbar 1 1 2,\
+ "futures.dat" using 1:3:4:5 title "Close" with errorbar 1 1 1
+
+ pause -1 "Hit Return to Continue"
+
+ set xlabel "High Low Opening Prices with Center Tics"
+ plot "futures.dat" using 1:3:4:5 with errorbar 1 1 3,\
+ "futures.dat" using 1:6 with lines
+
+ pause -1 "Hit Return to Continue"
+
+ set xlabel "High Low Prices without Center Tics"
+ plot "futures.dat" using 1:3:4:5 with errorbar 1 1 4
+
+ pause -1 "Hit Return to Continue"
+
+ set autoscale y
+ set logscale y
+ set xlabel ""
+ set ylabel "Contract Volume"
+ set yrange [10:1e5]
+ plot "futures.dat" using 1:7 title "Daily Volume" with impulses,\
+ "futures.dat" using 1:8 title "Open Interest" with dots
+
+
set title ""
+ set ylabel ""
set autoscale
pause -1 "Hit return to continue"
Only in gnuplot3_26/demo: errorbar.demo.orig
Only in gnuplot3_26/demo: futures.dat
diff -rc gnuplot/demo/hidden.demo gnuplot3_26/demo/hidden.demo
*** gnuplot/demo/hidden.demo Wed Mar 25 07:59:14 1992
--- gnuplot3_26/demo/hidden.demo Tue Mar 24 22:42:25 1992
***************
*** 1,7 ****
#
! # $Id$
! #
! # $Log$
#
set samples 20
set isosamples 20
--- 1,5 ----
#
! # $Id: hidden.demo,v 3.26 92/03/24 22:32:39 woo Exp Locker: woo $
#
set samples 20
set isosamples 20
Only in gnuplot3_26/docs: RCS
Only in gnuplot3_26/docs: doc2gih
diff -rc gnuplot/docs/gnuplot.doc gnuplot3_26/docs/gnuplot.doc
*** gnuplot/docs/gnuplot.doc Wed Mar 25 08:00:28 1992
--- gnuplot3_26/docs/gnuplot.doc Thu Apr 9 21:00:04 1992
***************
*** 773,781 ****
<ycol>, and <zcol> can be entered as constants or expressions.
If errorbars (see also `plot errorbars`) are used for `plot`s,
! ydelta (for example, a +/- error) should be provided as the third
! column, or ylow and yhigh as third and fourth columns. These columns
! must follow the x and y columns.
Scanf strings override any <xcol>:<ycol>(:<zcol>) choices, except for
ordering of input, e.g.,
--- 773,781 ----
<ycol>, and <zcol> can be entered as constants or expressions.
If errorbars (see also `plot errorbars`) are used for `plot`s,
! ydelta (for example, a +/- error) is assumed if three columns are present.
! If four columns are present, the data is assumed to consist of ylow and
! yhigh. There is no restriction on the order of the data.
Scanf strings override any <xcol>:<ycol>(:<zcol>) choices, except for
ordering of input, e.g.,
***************
*** 825,838 ****
In the default situation, GNUPLOT expects to see three or four
numbers on each line of the data file, either (x, y, ydelta) or
! (x, y, ylow, yhigh). The x coordinate must be specified. The order
! of the numbers must be exactly as given above. Data files in this
! format can easily be plotted with error bars:
plot "data.dat" with errorbars
! The error bar is a vertical line plotted from (x, ylow) to (x,
! yhigh). If ydelta is specified instead of ylow and yhigh,
ylow=y-ydelta and yhigh=y+ydelta are derived. If there
are only two numbers on the line, yhigh and ylow are both set to
y. To get lines plotted between the data points, `plot` the
--- 825,838 ----
In the default situation, GNUPLOT expects to see three or four
numbers on each line of the data file, either (x, y, ydelta) or
! (x, y, ylow, yhigh). The x coordinate must be specified.
! Data files in this format can easily be plotted with error bars:
plot "data.dat" with errorbars
! The default error bar is a vertical line plotted from (x, ylow) to (x,
! yhigh) with tic marks at the top and bottom and a point of the current
! style at (x,y). If ydelta is specified instead of ylow and yhigh,
ylow=y-ydelta and yhigh=y+ydelta are derived. If there
are only two numbers on the line, yhigh and ylow are both set to
y. To get lines plotted between the data points, `plot` the
***************
*** 843,850 ****
The `using` option may be used to specify how columns of the data file
are to be assigned to x, y, ydelta, ylow, and yhigh. The x column must
! be provided and both the x and y columns must appear before the
! errorbar columns. If three column numbers are given, they are x, y,
and ydelta. If four columns are given, they are x, y, ylow, and
yhigh.
--- 843,849 ----
The `using` option may be used to specify how columns of the data file
are to be assigned to x, y, ydelta, ylow, and yhigh. The x column must
! be provided. If three column numbers are given, they are x, y,
and ydelta. If four columns are given, they are x, y, ylow, and
yhigh.
***************
*** 853,864 ****
plot "data.dat" using 1:2:3:4 with errorbars
plot "data.dat" using 3:2:6 with errorbars
plot "data.dat" using 3:4:8:7 with errorbars
The first example reads, x, y, ylow, and yhigh, from columns 1, 2, 3,
and 4. This is equivalent to the default. The second example reads x
from the third column, y from second and ydelta from the sixth column.
The third example reads x from the third column, y from the fourth,
! ylow from the eighth, and yhigh from seventh columns.
See also `plot using` and `plot style`.
3 parametric
--- 852,880 ----
plot "data.dat" using 1:2:3:4 with errorbars
plot "data.dat" using 3:2:6 with errorbars
plot "data.dat" using 3:4:8:7 with errorbars
+ plot "data.dat" using 8:7:3:4 with errorbars 1 1 1
+ plot "data.dat" using 3:7:8:4 with errorbars 1 2 2
+ plot "data.dat" using 1:8:4 with errorbars 1 5 3
+
The first example reads, x, y, ylow, and yhigh, from columns 1, 2, 3,
and 4. This is equivalent to the default. The second example reads x
from the third column, y from second and ydelta from the sixth column.
The third example reads x from the third column, y from the fourth,
! ylow from the eighth, and yhigh from seventh columns. The fourth
! example reads x from the eigth column, y from the seventh, ylow from
! the third, yhigh from the fourth and uses line style 1, point style 1
! and errorbar style 1, which consists of left tic marks at (x,y) and
! no tic marks at the top and bottom of the errorbar. The fifth example
! reads x from the third column, y from the seventh column, ylow from the
! eigth column, yhigh from the fourth column and uses line style 1, point
! style 2 and errorbar style 2 which consists of right tic marks at (x,y)
! and no tic marks at the top and bottom of the errorbar. These two
! style were chosen for financial data. The last example reads x from
! the first column, y from the eigth column, ydelta from the fourth column
! and uses line style 1, point style 5 and errorbar style 3 which consists
! of center tic marks at (x,y) and no tic marks at the top and bottom of
! the errorbar.
See also `plot using` and `plot style`.
3 parametric
***************
*** 957,966 ****
is treated like `points` for `splot`s and function `plot`s. For data
`plot`s, `errorbars` is like `points`, except that a vertical error
bar is also drawn: for each point (x,y), a line is drawn from
! (x,ylow) to (x,yhigh). A tic mark is placed at the ends of the error
! bar. The ylow and yhigh values are read from the data file's columns,
! as specified with the `using` option to plot. See `plot errorbars` for
! more information.
Default styles are chosen with the `set function style` and
`set data style` commands.
--- 973,982 ----
is treated like `points` for `splot`s and function `plot`s. For data
`plot`s, `errorbars` is like `points`, except that a vertical error
bar is also drawn: for each point (x,y), a line is drawn from
! (x,ylow) to (x,yhigh). The default errorbar style has a tic mark
! placed at the ends of the error bar. The ylow and yhigh values
! are read from the data file's columns, as specified with the
! `using` option to plot. See `plot errorbars` for more information.
Default styles are chosen with the `set function style` and
`set data style` commands.
***************
*** 974,984 ****
plotted with points.
If desired, the style and (optionally) the line type and point type
! used for a curve can be specified.
Syntax:
! with <style> {<linetype> {<pointtype>}}
where <style> is either `lines`, `points`, `linespoints`, `impulses`,
`dots`, or `errorbars`. The <linetype> and <pointtype> are positive
--- 990,1001 ----
plotted with points.
If desired, the style and (optionally) the line type and point type
! used for a curve can be specified. For errorbars, an additional
! (optional) errorbar type can be specified.
Syntax:
! with <style> {<linetype> {<pointtype> {<errorbartype>}}}
where <style> is either `lines`, `points`, `linespoints`, `impulses`,
`dots`, or `errorbars`. The <linetype> and <pointtype> are positive
***************
*** 1267,1272 ****
--- 1284,1313 ----
set border
set noborder
show border
+ 3 bottom_title (Ames Local Mod)
+ ?set bottom_title
+ ?show bottom_title
+ ?title
+ The `set bottom_title` command produces a plot title which will be centered
+ at the bottom of the plot. Using the optional x/y screen offsets, the
+ bottom_title can be arbitrarily placed anywhere on the plot.
+ `set bottom_title` with no parameters clears the bottom_title.
+
+ Syntax:
+ set bottom_title {"title-text"} {x}{,y}
+ show bottom_title
+
+ Specifying constants x or y as optional offsets for the bottom_title will
+ move the bottom_title x or y character screen coordinates. All parameters
+ are optional; for example:
+
+ set bottom_title ,-1
+
+ will change only the y offset of the bottom_title, moving the bottom_title
+ down by roughly the height of one character.
+
+ (The Latex, EEPIC, and Imagen drivers allow \\ in a string to specify
+ a newline.)
3 clip
?set clip
?set noclip
***************
*** 1881,1890 ****
treated like `points` for function `plot`s and `splot`s. For data file
`plot`s, `errorbars` is like `points`, except that a vertical error
bar is also drawn: for each point (x,y), a line is drawn from (x,ylow)
! to (x,yhigh). A tic mark is placed at the ends of the error bar. The
! ylow and yhigh values are read from the data file's third and fourth
! columns, or as specified with the `using` option to plot. See `plot
! errorbars` for more information.
Default styles are chosen with the `set function style` and `set
data style` commands. See `plot style` for information about how
--- 1922,1932 ----
treated like `points` for function `plot`s and `splot`s. For data file
`plot`s, `errorbars` is like `points`, except that a vertical error
bar is also drawn: for each point (x,y), a line is drawn from (x,ylow)
! to (x,yhigh). The default errorbar type has a tic mark placed
! at the ends of the error bar. The ylow and yhigh values are read
! from the data file's third and fourth columns, or as specified
! with the `using` option to plot. See `plot errorbars` for
! more information.
Default styles are chosen with the `set function style` and `set
data style` commands. See `plot style` for information about how
***************
*** 2170,2175 ****
--- 2212,2241 ----
will change only the y offset of the title, moving the title down by
roughly the height of one character.
+
+ (The Latex, EEPIC, and Imagen drivers allow \\ in a string to specify
+ a newline.)
+ 3 top_title (Ames Local Mod)
+ ?set top_title
+ ?show top_title
+ ?title
+ The `set top_title` command produces a plot title which will be centered
+ at the top of the plot. Using the optional x/y screen offsets, the
+ top_title can be arbitrarily placed anywhere on the plot. `set top_title`
+ with no parameters clears the top_title.
+
+ Syntax:
+ set top_title {"title-text"} {x}{,y}
+ show top_title
+
+ Specifying constants x or y as optional offsets for the top_title will
+ move the top_title x or y character screen coordinates. All parameters
+ are optional; for example:
+
+ set top_title ,-1
+
+ will change only the y offset of the top_title, moving the top_title down
+ by roughly the height of one character.
(The Latex, EEPIC, and Imagen drivers allow \\ in a string to specify
a newline.)
Only in gnuplot3_26/docs: gnuplot.doc.orig
Only in gnuplot3_26/docs: gnuplot.gih
Common subdirectories: gnuplot/docs/latextut and gnuplot3_26/docs/latextut
Only in gnuplot3_26/docs/latextut: RCS
Only in gnuplot3_26/term: RCS
diff -rc gnuplot/term/hpgl.trm gnuplot3_26/term/hpgl.trm
*** gnuplot/term/hpgl.trm Wed Mar 25 08:00:44 1992
--- gnuplot3_26/term/hpgl.trm Tue Apr 7 10:56:06 1992
***************
*** 62,70 ****
PCL_PORT_init()
{
! fputs("\033E\033&l1X\033&l0O\033&2A\033%0B;PW0.15\n",outfile);
! /* 1 2 3 4 5 6
! 1. reset the printer
2. one copy
3. portrait orientation
4. use letter paper
--- 62,69 ----
PCL_PORT_init()
{
! fputs("\033&l1X\033&l0O\033&2A\033%0B;PW0.15\n",outfile);
! /* 2 3 4 5 6
2. one copy
3. portrait orientation
4. use letter paper
***************
*** 75,82 ****
PCL_LAND_init()
{
! fputs("\033E\033&l1X\033&l1O\033%0B;PW0.15\n",outfile);
/*
1 2 3 4 5
1. reset the printer
2. one copy
--- 74,82 ----
PCL_LAND_init()
{
! fputs("\033&l1X\033&l1O\033%0B;PW0.15\n",outfile);
/*
+ fputs("\033E\033&l1X\033&l1O\033%0B;PW0.15\n",outfile);
1 2 3 4 5
1. reset the printer
2. one copy
***************
*** 90,96 ****
PCL_graphics()
{
fprintf(outfile,
! "\033%0B\nIN;\nSC0,%d,0,%d;\nSR%f,%f;\n",
PCL_XMAX,PCL_YMAX,
((double)(PCL_HCHAR)*200/3/PCL_XMAX),
((double)(PCL_VCHAR)*100/2/PCL_YMAX) );
--- 90,96 ----
PCL_graphics()
{
fprintf(outfile,
! "\033%%0B;SC0,%d,0,%d;\nSR%f,%f;\n",
PCL_XMAX,PCL_YMAX,
((double)(PCL_HCHAR)*200/3/PCL_XMAX),
((double)(PCL_VCHAR)*100/2/PCL_YMAX) );
diff -rc gnuplot/term/next.trm gnuplot3_26/term/next.trm
*** gnuplot/term/next.trm Wed Mar 25 07:59:14 1992
--- gnuplot3_26/term/next.trm Tue Mar 24 22:44:52 1992
***************
*** 1,7 ****
/*
! * $Id$
! *
! * $Log$
*/
/* GNUPLOT - next.trm */
--- 1,5 ----
/*
! * $Id: next.trm,v 3.26 92/03/24 22:35:18 woo Exp Locker: woo $
*/
/* GNUPLOT - next.trm */
diff -rc gnuplot/term/pbm.trm gnuplot3_26/term/pbm.trm
*** gnuplot/term/pbm.trm Wed Mar 25 07:59:14 1992
--- gnuplot3_26/term/pbm.trm Tue Mar 24 22:44:59 1992
***************
*** 1,13 ****
/*
! * $Id: pbm.trm,v 3.24 1992/02/29 16:23:41 woo Exp woo $
! *
! * $Log: pbm.trm,v $
! * Revision 3.24 1992/02/29 16:23:41 woo
! * gnuplot3.2, beta 4
! *
! * Revision 3.23 1992/02/21 20:18:16 woo
! * gnuplot3.2, beta 3
! *
*/
/* GNUPLOT - pbm.trm */
--- 1,5 ----
/*
! * $Id: pbm.trm,v 3.26 92/03/24 22:35:38 woo Exp Locker: woo $
*/
/* GNUPLOT - pbm.trm */